From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 6 Mar 2013 23:01:12 +0000 (-0500)
Subject: main: Show the greeter dialog when we're prepared
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4520
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=65067c24cc7207cbdb32b5091da536a247193fcd;p=gnome-shell.git

main: Show the greeter dialog when we're prepared

If we don't wait until the stage is mapped, pushing a modal
will fail with an X error.

https://bugzilla.gnome.org/show_bug.cgi?id=694321
---

diff --git a/js/ui/main.js b/js/ui/main.js
index f727a661b..b0a8c2d34 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -84,8 +84,6 @@ function _sessionUpdated() {
                                   Shell.KeyBindingMode.NORMAL |
                                   Shell.KeyBindingMode.OVERVIEW,
                                   sessionMode.hasRunDialog ? openRunDialog : null);
-    if (sessionMode.isGreeter && screenShield)
-        screenShield.showDialog();
 }
 
 function start() {
@@ -191,6 +189,12 @@ function _initializeUI() {
     ExtensionDownloader.init();
     ExtensionSystem.init();
 
+    if (sessionMode.isGreeter && screenShield) {
+        layoutManager.connect('startup-prepared', function() {
+            screenShield.showDialog();
+        });
+    }
+
     layoutManager.connect('startup-complete', function() {
                               if (keybindingMode == Shell.KeyBindingMode.NONE) {
                                   keybindingMode = Shell.KeyBindingMode.NORMAL;